Adjust the handling of min values for the x and y axes of extended input

2006-03-04  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkinput-x11 (gdk_input_translate_coordinates):
	Adjust the handling of min values for the x and y axes of
	extended input devices  (#324562, #142536, Denis Auroux and
	Robert Ögren)

diff --git a/ChangeLog b/ChangeLog
index 5a68551c1d2aaf885f873a478fc124ca53c6857d..2501733db8f0ee65f1c776129d2d10e97a3fbd0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-03-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkinput-x11 (gdk_input_translate_coordinates):
+       Adjust the handling of min values for the x and y axes of 
+       extended input devices  (#324562, #142536, Denis Auroux and 
+       Robert Ögren)
+
        * gtk/gtkexpander.c (gtk_expander_paint_focus): Position
        the focus rectangle correctly in RTL mode.  (#333291,
        Benjamin Berg)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5a68551c1d2aaf885f873a478fc124ca53c6857d..2501733db8f0ee65f1c776129d2d10e97a3fbd0b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2006-03-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkinput-x11 (gdk_input_translate_coordinates):
+       Adjust the handling of min values for the x and y axes of 
+       extended input devices  (#324562, #142536, Denis Auroux and 
+       Robert Ögren)
+
        * gtk/gtkexpander.c (gtk_expander_paint_focus): Position
        the focus rectangle correctly in RTL mode.  (#333291,
        Benjamin Berg)

diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index 64485aab85ee6d881fbe44e6824552b3b47d58d1..8a7cf145157a20da2b2293c85a8b62e676296905 100644 (file)
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -511,12 +511,14 @@ gdk_input_translate_coordinates (GdkDevicePrivate *gdkdev,
       switch (gdkdev->info.axes[i].use)
        {
        case GDK_AXIS_X:
-         axis_out[i] = x_offset + x_scale * axis_data[x_axis];
+         axis_out[i] = x_offset + x_scale * (axis_data[x_axis] - 
+           gdkdev->axes[x_axis].min_value);
          if (x_out)
            *x_out = axis_out[i];
          break;
        case GDK_AXIS_Y:
-         axis_out[i] = y_offset + y_scale * axis_data[y_axis];
+         axis_out[i] = y_offset + y_scale * (axis_data[y_axis] - 
+           gdkdev->axes[y_axis].min_value);
          if (y_out)
            *y_out = axis_out[i];
          break;